Skip to contentSkip to conversation

systemd: add missing include for musl

PATCH In review Yureka 2 participants 3 messages Oct 18, 2021

lore
Share & tools
lore

Yureka

author
#0 lore raw

PATCH 1/1 systemd: add missing include for musl

Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this function)" in src/shared/mount-setup.c.

---
 .../0008-add-missing-FTW_-macros-for-musl.patch  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +14 -2
index 95c3000aa1..792727ed8e 100644
@@ -10,10 +10,10 @@ This is to avoid build failures like below for musl.
 Upstream-Status: Inappropriate [musl specific]
 
 Signed-off-by: Chen Qi <[email protected]>
-
 ---
  src/basic/missing_type.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ src/shared/mount-setup.c |  1 +
+ 2 files changed, 21 insertions(+)
 
 diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
 index aeaf6ad5ec..3df1084ef2 100644
@@ -43,3 +43,15 @@ index aeaf6ad5ec..3df1084ef2 100644
 +#ifndef FTW_SKIP_SIBLINGS
 +#define FTW_SKIP_SIBLINGS 3
 +#endif
+diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
+index ef3527e9a7..c1cab40eb8 100644
+--- a/src/shared/mount-setup.c
++++ b/src/shared/mount-setup.c
+@@ -32,6 +32,7 @@
+ #include "strv.h"
+ #include "user-util.h"
+ #include "virt.h"
++#include "missing_type.h"
+ 
+ typedef enum MountMode {
+         MNT_NONE           = 0,
Signature · 1 line
2.33.0
#1 lore raw

The recipe needs to be adjusted as well?

Alex

Quoted 60 lines · Yureka via lists.openembedded.org

Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this function)" in src/shared/mount-setup.c.

---
 .../0008-add-missing-FTW_-macros-for-musl.patch  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 95c3000aa1..792727ed8e 100644
---
a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
+++
b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch

meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +14 -3
@@ -10,10 +10,10 @@ This is to avoid build failures like below for musl.
 Upstream-Status: Inappropriate [musl specific]
 
 Signed-off-by: Chen Qi <[email protected]>
-
 ---
  src/basic/missing_type.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ src/shared/mount-setup.c |  1 +
+ 2 files changed, 21 insertions(+)
 
 diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
 index aeaf6ad5ec..3df1084ef2 100644
@@ -43,3 +43,15 @@ index aeaf6ad5ec..3df1084ef2 100644
 +#ifndef FTW_SKIP_SIBLINGS
 +#define FTW_SKIP_SIBLINGS 3
 +#endif
+diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
+index ef3527e9a7..c1cab40eb8 100644
+--- a/src/shared/mount-setup.c
++++ b/src/shared/mount-setup.c
+@@ -32,6 +32,7 @@
+ #include "strv.h"
+ #include "user-util.h"
+ #include "virt.h"
++#include "missing_type.h"
+
+ typedef enum MountMode {
+         MNT_NONE           = 0,
--

2.33.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#157055):
https://lists.openembedded.org/g/openembedded-core/message/157055
Mute This Topic: https://lists.openembedded.org/mt/86411771/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#2 lore raw

I don't think so, this change an existing related patch instead of adding a new one.

Quoted 71 lines · Alexander Kanavin

The recipe needs to be adjusted as well?

Alex

On Mon, 18 Oct 2021 at 14:03, Yureka via lists.openembedded.org
<http://lists.openembedded.org> <[email protected]> wrote:

    Fixes "error: ‘FTW_ACTIONRETVAL’ undeclared (first use in this
    function)" in src/shared/mount-setup.c.

    Signed-off-by: Yureka <[email protected]>
    ---
     .../0008-add-missing-FTW_-macros-for-musl.patch  | 16
    ++++++++++++++--
     1 file changed, 14 insertions(+), 2 deletions(-)

    diff --git
    a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
    b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
    index 95c3000aa1..792727ed8e 100644
    ---
    a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
    +++
    b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
    @@ -10,10 +10,10 @@ This is to avoid build failures like below for
    musl.
     Upstream-Status: Inappropriate [musl specific]

     Signed-off-by: Chen Qi <[email protected]>
    -
     ---
      src/basic/missing_type.h | 20 ++++++++++++++++++++
    - 1 file changed, 20 insertions(+)
    + src/shared/mount-setup.c |  1 +
    + 2 files changed, 21 insertions(+)

     diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
     index aeaf6ad5ec..3df1084ef2 100644
    @@ -43,3 +43,15 @@ index aeaf6ad5ec..3df1084ef2 100644
     +#ifndef FTW_SKIP_SIBLINGS
     +#define FTW_SKIP_SIBLINGS 3
     +#endif
    +diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
    +index ef3527e9a7..c1cab40eb8 100644
    +--- a/src/shared/mount-setup.c
    ++++ b/src/shared/mount-setup.c
    +@@ -32,6 +32,7 @@
    + #include "strv.h"
    + #include "user-util.h"
    + #include "virt.h"
    ++#include "missing_type.h"
    +
    + typedef enum MountMode {
    +         MNT_NONE           = 0,
    -- 
    2.33.0


    -=-=-=-=-=-=-=-=-=-=-=-
    Links: You receive all messages sent to this group.
    View/Reply Online (#157055):
    https://lists.openembedded.org/g/openembedded-core/message/157055
    Mute This Topic: https://lists.openembedded.org/mt/86411771/1686489
    Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
    Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    [[email protected]]
    -=-=-=-=-=-=-=-=-=-=-=-